Merge git://git.denx.de/u-boot-cfi-flash
authorTom Rini <[email protected]>
Mon, 16 Apr 2018 12:31:17 +0000 (08:31 -0400)
committerTom Rini <[email protected]>
Mon, 16 Apr 2018 12:31:17 +0000 (08:31 -0400)

Trivial merge